widget: Adapt _gtk_widget_get_preferred_size_for_size()

... for baseline support byu taking two extra (possible NULL) arguments.

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 62615cc711fb53585f73c19e686834c8a791934c..ec67a11f997d21bdd095fb99c18426df1b3c0670 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -356,7 +356,7 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
 
       if (gtk_widget_get_visible (child))
         {
-          _gtk_widget_get_preferred_size_for_size (child, orientation, size, &child_minimum, &child_natural);
+          _gtk_widget_get_preferred_size_for_size (child, orientation, size, &child_minimum, &child_natural, NULL, NULL);
 
           if (use_toggle_size)
             {

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 8e968657fca593f098704ba1194f2231b7f03d9d..3265f982e9b372dceae83dc4461e5834d45ea988 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2267,7 +2267,9 @@ gtk_notebook_size_request (GtkWidget      *widget,
                                                    orientation,
                                                    size, 
                                                    &child_minimum,
-                                                   &child_natural);
+                                                   &child_natural,
+                                                   NULL,
+                                                   NULL);
 
           *minimum = MAX (*minimum, child_minimum);
           *natural = MAX (*natural, child_natural);

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 4d16e4fe026b4f4c4d3f91dd2e8c034bdd892f6c..3203cea0ca25fb2febadfce99071f055775be80e 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -885,7 +885,7 @@ gtk_paned_get_preferred_size (GtkWidget      *widget,
 
   if (priv->child1 && gtk_widget_get_visible (priv->child1))
     {
-      _gtk_widget_get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat);
+      _gtk_widget_get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat, NULL, NULL);
       if (priv->child1_shrink && priv->orientation == orientation)
         *minimum = 0;
       else
@@ -895,7 +895,7 @@ gtk_paned_get_preferred_size (GtkWidget      *widget,
 
   if (priv->child2 && gtk_widget_get_visible (priv->child2))
     {
-      _gtk_widget_get_preferred_size_for_size (priv->child2, orientation, size, &child_min, &child_nat);
+      _gtk_widget_get_preferred_size_for_size (priv->child2, orientation, size, &child_min, &child_nat, NULL, NULL);
 
       if (priv->orientation == orientation)
         {

diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index 26a7efc7693c9aaae7ab687560b1f4e325778f44..ed30f9515d4ac44541b631de77200f23688062c0 100644 (file)
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -858,20 +858,33 @@ _gtk_widget_get_preferred_size_for_size (GtkWidget      *widget,
                                          GtkOrientation  orientation,
                                          gint            size,
                                          gint           *minimum,
-                                         gint           *natural)
+                                         gint           *natural,
+                                         gint           *minimum_baseline,
+                                         gint           *natural_baseline)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (size >= -1);
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    if (size < 0)
-      gtk_widget_get_preferred_width (widget, minimum, natural);
-    else
-      gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
+    {
+      if (size < 0)
+        gtk_widget_get_preferred_width (widget, minimum, natural);
+      else
+        gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
+
+      if (minimum_baseline)
+        *minimum_baseline = -1;
+      if (natural_baseline)
+        *natural_baseline = -1;
+    }
   else
-    if (size < 0)
-      gtk_widget_get_preferred_height (widget, minimum, natural);
-    else
-      gtk_widget_get_preferred_height_for_width (widget, size, minimum, natural);
+    {
+      gtk_widget_get_preferred_height_and_baseline_for_width (widget,
+                                                              size,
+                                                              minimum,
+                                                              natural,
+                                                              minimum_baseline,
+                                                              natural_baseline);
+    }
 }
 

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 6ec03fd9b4178db8c9539f273ab8df02e149e41f..7af552d51e0255a3ccfbf57341a7ec48d4017988 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -76,7 +76,9 @@ void _gtk_widget_get_preferred_size_for_size   (GtkWidget         *widget,
                                                 GtkOrientation     orientation,
                                                 gint               size,
                                                 gint              *minimum,
-                                                gint              *natural);
+                                                gint              *natural,
+                                                gint              *minimum_baseline,
+                                                gint              *natural_baseline);
 gboolean _gtk_widget_has_baseline_support (GtkWidget *widget);
 
 gboolean _gtk_widget_get_translation_to_window (GtkWidget      *widget,